Fix layout xml and page layout caching issue on redis cluster under high load by andrey-legayev · Pull Request #22766 · magento/magento2

andrey-legayev · 2019-05-07T12:12:05Z

Description (*)

Bugs which were fixed:

$this->pageLayout was not checked after reading from cache, but was used as is
two cache items were used in once place instead of one (performance impact)

Changes:

replace 2 cache items by 1 - it should improve performance
add "_MERGED" to cache key suffix to have compatibility with old cache keys during deployment of new version

Fixed Issues (if relevant)

Layout corruption with php-fpm (a Magento 1 problem returns) #6942 Layout corruption (Title is wrong, but issue is real)
Corrupt layout cache causes white page on customer account login #22976 Corrupt layout cache causes white page on customer account login

Manual testing scenarios (*)

N/A

Contribution checklist (*)

Pull request has a meaningful description of its purpose
All commits are accompanied by meaningful commit messages
All new or changed code is covered with unit/integration tests (if applicable)
All automated tests passed successfully (all builds on Travis CI are green)

m2-assistant · 2019-05-07T12:12:09Z

Hi @andrey-legayev. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

@magento-engcom-team give me test instance - deploy test instance based on PR changes
@magento-engcom-team give me 2.3-develop instance - deploy vanilla Magento instance

For more details, please, review the Magento Contributor Assistant documentation

orlangur

After changes are applied and all builds are green, please squash them into a single commit so that we have perfectly clean history 😉

magento-engcom-team · 2019-05-07T13:00:41Z

Hi @ihor-sviziev, thank you for the review.
ENGCOM-5079 has been created to process this Pull Request

magento-engcom-team · 2019-05-07T13:51:50Z

Hi @orlangur, thank you for the review.
ENGCOM-5079 has been created to process this Pull Request

orlangur

After changes are applied and all builds are green, please squash them into a single commit so that we have perfectly clean history 😉

andrey-legayev · 2019-05-08T08:44:43Z

Why can't you apply pull requests with "merge squash" option? I saw it in other github repositories.

orlangur · 2019-05-08T08:55:26Z

@andrey-legayev I suggested it already, there were some concerns regarding commits authorship from EngCom guys. So for now should do it manually.

lib/internal/Magento/Framework/View/Model/Layout/Merge.php

magento-engcom-team · 2019-05-16T12:50:45Z

Hi @orlangur, thank you for the review.
ENGCOM-5079 has been created to process this Pull Request

andrey-legayev · 2019-05-16T14:59:59Z

I reviewed all reports of Static Tests build / Static tests for CE.
I did not touch those problematic lines of code.
Can this pull request be approved?

xmav · 2019-05-22T01:08:09Z

@VladimirZaets, @orlangur Can static tests failures be approved taking into account
magento/devdocs#4425 ?

orlangur

@andrey-legayev static tests are now fixed, but changes must be squashed.

andrey-legayev · 2019-05-28T14:23:57Z

@andrey-legayev static tests are now fixed, but changes must be squashed.

I have only one commit in this pull request. The rest belong to @xmav

orlangur · 2019-05-28T14:31:06Z

@andrey-legayev sure, just squash all changes under your single commit. If you don't feel so, there could be a second squashed commit by @xmav but I don't see a reason to do so.

xmav · 2019-05-28T14:35:45Z

Fill free to squash all changes under single commit

commit 8ba60263e9ad5e822b7b7efc1b25044083156778 Author: Maksym Aposov <xmav@users.noreply.github.com> Date: Wed May 22 18:28:50 2019 -0500 Fix layout xml and page layout caching issue on redis cluster under high load -Fixed static tests commit 8112423572d913a72cc41516cb82739a3e2cf2d8 Author: Maksym Aposov <xmav@users.noreply.github.com> Date: Wed May 22 18:27:54 2019 -0500 Fix layout xml and page layout caching issue on redis cluster under high load -Fixed static tests commit 9406be5d973b4d797b6eff86179ab83f5bc10f0f Author: Maksym Aposov <xmav@users.noreply.github.com> Date: Wed May 22 13:38:09 2019 -0500 Fix layout xml and page layout caching issue on redis cluster under high load -Fixed static tests commit f637c2258c6c8f0cc71d1726da18ae652a85791f Author: Andrey Legayev <andrey@ven.com> Date: Thu May 16 15:48:03 2019 +0300 Fix layout xml and page layout caching issue on redis cluster under high load Bugs which were fixed: - $this->pageLayout was not checked after reading from cache, but was used as is - two cache items were used in once place instead of one (performance impact) Changes: - replace 2 cache items by 1 - it should improve performance - add "_MERGED" to cache key suffix to have compatibility with old cache keys during deployment of new version

andrey-legayev · 2019-05-28T14:39:16Z

Squashed. I hope this is last squash in this PR...

magento-engcom-team · 2019-05-28T14:43:46Z

Hi @orlangur, thank you for the review.
ENGCOM-5079 has been created to process this Pull Request

VasylShvorak · 2019-05-31T07:24:48Z

✔️ QA passed

ghost · 2019-06-19T08:51:34Z

@magento-cicd2 unfortunately, only members of the maintainers team are allowed to unassign developers from the pull request

andrey-legayev · 2019-06-27T14:20:14Z

This fix has been already included into v2.3.2 by cherry-picking commit b65ff72.
I'm closing pull request.

m2-assistant · 2019-06-27T14:20:15Z

Hi @andrey-legayev, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

magento-engcom-team added Component: View Release Line: 2.3 labels May 7, 2019

This was referenced May 7, 2019

Fix layout xml and page layout caching issue on redis cluster under high load #22765

Closed

[Backport] Fix layout xml and page layout caching issue on redis cluster under high load #22625

Closed

orlangur requested changes May 7, 2019

View reviewed changes

ghost assigned orlangur May 7, 2019

ghost added the Progress: needs update label May 7, 2019

andrey-legayev mentioned this pull request May 7, 2019

Layout corruption with php-fpm (a Magento 1 problem returns) #6942

Closed

andrey-legayev requested a review from orlangur May 7, 2019 12:48

ihor-sviziev approved these changes May 7, 2019

View reviewed changes

ghost assigned ihor-sviziev May 7, 2019

ghost added Progress: ready for testing and removed Progress: needs update labels May 7, 2019

orlangur approved these changes May 7, 2019

View reviewed changes

orlangur requested changes May 8, 2019

View reviewed changes

ghost added Progress: needs update and removed Progress: ready for testing labels May 8, 2019

VladimirZaets requested changes May 10, 2019

View reviewed changes

lib/internal/Magento/Framework/View/Model/Layout/Merge.php Outdated Show resolved Hide resolved

ghost assigned VladimirZaets May 10, 2019

orlangur approved these changes May 16, 2019

View reviewed changes

ghost added Progress: ready for testing and removed Progress: needs update labels May 16, 2019

ghost added Progress: accept and removed Progress: extended testing labels May 24, 2019

ihor-sviziev mentioned this pull request May 24, 2019

Corrupt layout cache causes white page on customer account login #22976

Closed

orlangur requested changes May 28, 2019

View reviewed changes

ghost added Progress: needs update and removed Progress: accept labels May 28, 2019

orlangur approved these changes May 28, 2019

View reviewed changes

ghost added Progress: ready for testing and removed Progress: needs update labels May 28, 2019

ghost added Progress: testing in progress and removed Progress: ready for testing labels May 29, 2019

ghost added Progress: extended testing and removed Progress: testing in progress labels May 31, 2019

andrey-legayev requested a review from VladimirZaets May 31, 2019 07:30

ghost added Progress: accept and removed Progress: extended testing labels May 31, 2019

magento-cicd2 unassigned VasylShvorak Jun 19, 2019

andrey-legayev closed this Jun 27, 2019

andrey-legayev deleted the layout-cache-fix-2.3-dev branch September 22, 2019 16:08

ihor-sviziev unassigned Nazar65 Sep 9, 2020

Conversation

andrey-legayev commented May 7, 2019 • edited by ihor-sviziev Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description (*)

Fixed Issues (if relevant)

Manual testing scenarios (*)

Contribution checklist (*)

Uh oh!

m2-assistant bot commented May 7, 2019

Uh oh!

orlangur left a comment

Choose a reason for hiding this comment

Uh oh!

magento-engcom-team commented May 7, 2019

Uh oh!

magento-engcom-team commented May 7, 2019

Uh oh!

orlangur left a comment

Choose a reason for hiding this comment

Uh oh!

andrey-legayev commented May 8, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

orlangur commented May 8, 2019

Uh oh!

Uh oh!

magento-engcom-team commented May 16, 2019

Uh oh!

andrey-legayev commented May 16, 2019

Uh oh!

xmav commented May 22, 2019

Uh oh!

orlangur left a comment

Choose a reason for hiding this comment

Uh oh!

andrey-legayev commented May 28, 2019

Uh oh!

orlangur commented May 28, 2019

Uh oh!

xmav commented May 28, 2019

Uh oh!

andrey-legayev commented May 28, 2019

Uh oh!

magento-engcom-team commented May 28, 2019

Uh oh!

VasylShvorak commented May 31, 2019

Uh oh!

ghost commented Jun 19, 2019

Uh oh!

andrey-legayev commented Jun 27, 2019 • edited by ihor-sviziev Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

m2-assistant bot commented Jun 27, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

andrey-legayev commented May 7, 2019 •

edited by ihor-sviziev

Loading

andrey-legayev commented May 8, 2019 •

edited

Loading

andrey-legayev commented Jun 27, 2019 •

edited by ihor-sviziev

Loading